From ea0ce2d4397e1efba60b7f30d422a6649036f266 Mon Sep 17 00:00:00 2001 From: "mip@xencore04.1virtual.net" Date: Mon, 3 Apr 2006 18:28:54 +0100 Subject: [PATCH] Improve pygrub error reporting when opening ext2 fs is not possible As reported in the thread: http://lists.xensource.com/archives/html/xen-users/2006-03/msg00721.html, pygrub does not open ext2 file systems in partitioned images or sub partitions on e.g. CentOS/RHEL 4, because e2fsprogs ext2fs_open does not support an offset into the file to be opened. With this patch, the error is correctly reported instead of a generic "unable to open file" (and leaving the user searching in the dark). Signed-off-by: Michael Paesold --- tools/pygrub/src/fsys/ext2/ext2module.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/tools/pygrub/src/fsys/ext2/ext2module.c b/tools/pygrub/src/fsys/ext2/ext2module.c index decf1ad652..63d20f2983 100644 --- a/tools/pygrub/src/fsys/ext2/ext2module.c +++ b/tools/pygrub/src/fsys/ext2/ext2module.c @@ -213,7 +213,9 @@ ext2_fs_open (Ext2Fs *fs, PyObject *args, PyObject *kwargs) int flags = 0, superblock = 0, offset = 0, err; unsigned int block_size = 0; ext2_filsys efs; +#ifdef HAVE_EXT2FS_OPEN2 char offsetopt[30]; +#endif if (!PyArg_ParseTupleAndKeywords(args, kwargs, "s|iiii", kwlist, &name, &flags, &superblock, @@ -225,19 +227,24 @@ ext2_fs_open (Ext2Fs *fs, PyObject *args, PyObject *kwargs) return NULL; } +#ifdef HAVE_EXT2FS_OPEN2 if (offset != 0) { snprintf(offsetopt, 29, "offset=%d", offset); } -#ifdef HAVE_EXT2FS_OPEN2 err = ext2fs_open2(name, offsetopt, flags, superblock, block_size, unix_io_manager, &efs); #else + if (offset != 0) { + PyErr_SetString(PyExc_ValueError, "offset argument not supported"); + return NULL; + } + err = ext2fs_open(name, flags, superblock, block_size, unix_io_manager, &efs); #endif if (err) { - PyErr_SetString(PyExc_ValueError, "unable to open file"); + PyErr_SetString(PyExc_ValueError, "unable to open filesystem"); return NULL; } -- 2.30.2